From: Marina Zhurakhinskaya <marinaz@src.gnome.org>
Date: Wed, 19 Nov 2008 19:25:51 +0000 (+0000)
Subject: Make sure we include staysPressed in the list of arguments to the Button object
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~11582
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f81e9d3aaab6510294ce0661fd38d322280a2361;p=gnome-shell.git

Make sure we include staysPressed in the list of arguments to the Button object
, so that we don't end up ignoring minHeight.

svn path=/trunk/; revision=58
---

diff --git a/js/ui/button.js b/js/ui/button.js
index 574060565..73f4a0933 100644
--- a/js/ui/button.js
+++ b/js/ui/button.js
@@ -18,8 +18,8 @@ const PARTIAL_OPACITY = 0.4 * 255;
 
 const FULL_OPACITY = 255;
 
-function Button(text, buttonColor, pressedButtonColor, minWidth, minHeight) {
-    this._init(text, buttonColor, pressedButtonColor, minWidth, minHeight);
+function Button(text, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight) {
+    this._init(text, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight);
 }
 
 Button.prototype = {
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 0cd4c8070..a43f3dbe8 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -34,7 +34,7 @@ Panel.prototype = {
 	background.set_position(-1, -1);
 	this._group.add_actor(background);
 
- 	this.button = new Button.Button("Activities", PANEL_BACKGROUND_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR, true, null, PANEL_HEIGHT);
+ 	this.button = new Button.Button("Activities", PANEL_BACKGROUND_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR, true, null, PANEL_HEIGHT-1);
 
  	this._group.add_actor(this.button.button);